diff options
Diffstat (limited to 'pkgs/applications/graphics/gimp/wrapper.nix')
| -rw-r--r-- | pkgs/applications/graphics/gimp/wrapper.nix | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 53067dc39c9a..7455a69dde97 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,24 +1,18 @@ -{ stdenv, lib, buildEnv, gimp, makeWrapper, gimpPlugins, plugins ? null}: +{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}: let allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins); selectedPlugins = if plugins == null then allPlugins else plugins; extraArgs = map (x: x.wrapArgs or "") selectedPlugins; -drv = buildEnv { - name = "gimp-with-plugins-" + (builtins.parseDrvName gimp.name).version; +in symlinkJoin { + name = "gimp-with-plugins-${gimp.version}"; paths = [ gimp ] ++ selectedPlugins; + buildInputs = [ makeWrapper ]; + postBuild = '' - # TODO: This could be avoided if buildEnv could be forced to create all directories - if [ -L $out/bin ]; then - rm $out/bin - mkdir $out/bin - for i in ${gimp}/bin/*; do - ln -s $i $out/bin - done - fi for each in gimp-2.8 gimp-console-2.8; do wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ @@ -29,5 +23,4 @@ drv = buildEnv { ln -sf "$each-2.8" $out/bin/$each done ''; - }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) +} |