diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/freeimage | |
parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/freeimage')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/freeimage/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/nixpkgs/pkgs/development/libraries/freeimage/default.nix index dd5056ced93f..de1b616fc20a 100644 --- a/nixpkgs/pkgs/development/libraries/freeimage/default.nix +++ b/nixpkgs/pkgs/development/libraries/freeimage/default.nix @@ -3,7 +3,7 @@ , libjpeg, jxrlib, pkg-config , fixDarwinDylibNames, autoSignDarwinBinariesHook }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "freeimage"; version = "unstable-2021-11-01"; @@ -12,7 +12,8 @@ stdenv.mkDerivation { rev = "1900"; sha256 = "rWoNlU/BWKZBPzRb1HqU6T0sT7aK6dpqKPe88+o/4sA="; }; - sourceRoot = "svn-r1900/FreeImage/trunk"; + + sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk"; # Ensure that the bundled libraries are not used at all prePatch = '' @@ -74,4 +75,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [viric l-as]; platforms = with lib.platforms; unix; }; -} +}) |