floorp: Fix tests for floorp-bin change
Several of the `floorp` tests were broken by the upstream switch to `floorp-bin`. Most changes were to do with not being able to use `programs.floorp.wrappedPackageName` in expected results.
This commit is contained in:
parent
bba859cd85
commit
d21bee5abf
5 changed files with 5 additions and 4 deletions
|
|
@ -37,7 +37,7 @@ in
|
|||
if pkgs.stdenv.hostPlatform.isDarwin then
|
||||
"${cfg.finalPackage}/${darwinPath}"
|
||||
else
|
||||
"${cfg.finalPackage}/lib/${cfg.wrappedPackageName}";
|
||||
"${cfg.finalPackage}/lib/${cfg.finalPackage.unwrapped.libName or cfg.wrappedPackageName}";
|
||||
config_file = "${libDir}/distribution/policies.json";
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ in
|
|||
if pkgs.stdenv.hostPlatform.isDarwin then
|
||||
"${cfg.finalPackage}/${darwinPath}"
|
||||
else
|
||||
"${cfg.finalPackage}/lib/${cfg.wrappedPackageName}";
|
||||
"${cfg.finalPackage}/lib/${cfg.finalPackage.unwrapped.libName or cfg.wrappedPackageName}";
|
||||
config_file = "${libDir}/distribution/policies.json";
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ let
|
|||
substitutions = [
|
||||
"--replace"
|
||||
"@name@"
|
||||
cfg.wrappedPackageName
|
||||
cfg.package.meta.mainProgram
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ in
|
|||
binaryName = cfg.wrappedPackageName;
|
||||
gtk3 = null;
|
||||
meta.description = "I pretend to be ${cfg.name}";
|
||||
meta.mainProgram = lib.toLower cfg.name;
|
||||
};
|
||||
outPath = null;
|
||||
buildScript =
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ in
|
|||
// {
|
||||
nmt.script = ''
|
||||
assertFileRegex \
|
||||
home-path/bin/${cfg.wrappedPackageName} \
|
||||
home-path/bin/${cfg.finalPackage.meta.mainProgram} \
|
||||
MOZ_APP_LAUNCHER
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue